Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 9 Dec 2005 10:51:35 +0000 (10:51 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 9 Dec 2005 10:51:35 +0000 (10:51 +0000)

Trivial merge